Fixes: 132983200 Test: make RunSettingsRoboTests, manual Change-Id: I3d4bc59d948236ff2482945a4fc976ee61c37c27