Bug: 111848213 Test: make -j50 RunSettingsRoboTests Change-Id: If1c46614ec6e40c66eb121cc48caa1fbc9c39871