Bug: 33701673 Test: make -j40 RunSettingsRoboTests Change-Id: I520cbc74284d92ab05b733346ee1b3115ddd8e9f