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