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