Change-Id: Icc1824758908b14ad895dcc28a63a5d9c685b490 Fix: 38328856 Fix: 38328641 Test: RunSettingsRoboTests