Bug: 229200265 Test: make -j64 RunSettingsRoboTests Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe