Caused by bad merge from ag/2360433 Test: make RunSettingsRoboTests Change-Id: I3fb55768686a6edc56dee60421c116dcf590239f