Bug: 118760361 Test: make -j42 RunSettingsRoboTests Change-Id: I2f663197f3c0f6c58529609845bab4dd7e714348