Bug: 144535188 Test: make -j42 RunSettingsRoboTests Change-Id: I3aa9c7ccf8df23527b8d2b79033c96ec1289c7ea