Bug: 36222960 Test: make -j40 RunSettingsRoboTests Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2c826d7