Bug: 70950124 Test: manual Test: make RunSettingsRoboTests Change-Id: I2a59d6b4b4549a780ae168e9e1b3f356c677262c