Bug: 148575561 Test: make RunSettingsRoboTests -j40 and manual tests Change-Id: I1832529edd55d9ba2053ccc0ff7e2bc93f4a00b5