Fix: 275217364 Test: make test RunSettingsRoboTests Change-Id: I16dd772aacaea3f8ddb6da579adb033124e3dbb7