Change-Id: I971c5f68ff3d881ad0285f87ab868a204edc9b7f Fixes: 73960246 Test: Manual test & make RunSettingsRoboTests