Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ic081fd7216981df4bb1ae11d6b53420773b8b9dc