Fixes: 63544783 Test: make -j RunSettingsRoboTests && manual Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a