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