Bug: 148822215 Test: make && make RunSettingsRoboTests Change-Id: Ia8d9002c7f85b607a8d87a69d04d3be1e59abcab