Change-Id: I475e90ab11a9821fc21623dcfdd3854914a7eb04 Fixes: 69002501 Test: Manual test & make RunSettingsRoboTests