Change-Id: Iba242871fce9c9bca8fbbc5d3ad3f7948f35d3d0 Fix: 36234108 Test: make RunSettingsRoboTests
2c826d7