Bug: 34135303 Test: make -j40 RunSettingsRoboTests Change-Id: Ieec7a1aa913553c74c6ebf9fb3d868e03e0c3bf6