Change-Id: Ia82adb4a964cb63c656c70a7277c76991c6b2505 Fixes: 76219062 Test: Manual test & make RunSettingsRoboTests