Fixes: 194251993 Fixes: 194021631 Test: make SettingsRoboTests Change-Id: Ibd1c7ce9d664820b2975039582a1ea5fb18b0be1