Bug: 31545801 Test: make RunSettingsRoboTests Change-Id: Idb801d51b6a4dc02ea062bc32086e1a8fc28b94b
Bug: 30918570 Change-Id: I4ae998676757b4985833fac5ba05d7685e29a8a8