Change-Id: I0b49af4afb4b782a6057060b2666f6528bc003b2 Fix: 36511169 Test: make RunSettingsRoboTests
2c826d7