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