Bug: 228274114 Test: make RunSettingsRoboTests Test: Manual test Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff