Change-Id: I419c16cbfc69861e01f28c14abdde137bd78f0bb Fix: 36458355 Test: make RunSettingsRoboTests
Bug: 35415714 Test: make RunSettingsRoboTests Change-Id: I48d6d094476c5fc83dbc17906d84cc848e499624