Bug: 111815935 Test: make -j50 RunSettingsRoboTests Change-Id: I5294439853ce35bccd883ed2aa21b33802d76cb1