Bug:35763944, 32590887 Test: make RunSettingsRoboTests Change-Id: Id8140b68a676e595bff095546fa119cd3ced2c4a