Bug: 123211155 Test: Manual,m -j RunSettingsRoboTests Change-Id: Ic669102c72a5270423f000d5326b48c91901a0ed