Change-Id: I64ff1b2d6ab77cf40159e6ad157ab2464e7970ed Fixes: 37250410 Test: visual, make RunSettingsRoboTests
2c826d7