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