Bug: 111939367 Test: make RunSettingsRoboTests, manual Change-Id: I4f65bd11a71db6601cea418a5d89b14d91858ab4