Change-Id: I417e7eb6f9c857ace4e8047b226abe03a7c8248d Fix: 36027848 Fix: 34392538 Test: make RunSettingsRoboTests