Change-Id: I6549ae01b31df39462d252e767fc3255b05813fe Fixes: 34277648 Test: make SettingsUnitTests, make RunSettingsRoboTests