Bug: 36924669 Test: RunSettingsRoboTests Change-Id: Id71b1324f567e7aa9b51dc25247fff9151d4e108
833927929e