Test: make RunSettingsRoboTests && manual Bug: 161861348 Change-Id: I73ce27d0aa740f47e6ed3e4be9bee4d5eaf039ad