Bug: 35141347 Test: make -j40 RunSettingsRoboTests, manual inspection Change-Id: I7661ef141aeb95d5ec707b8a066818892c3fa870