Change-Id: I28eeb3e5c3ed290d4e03e0f3989adde0b966bede Fix: 35851000 Test: make RunSettingsRoboTests
Bug: 34774945 Test: make RunSettingsRoboTests Change-Id: Ie5e113a6df85bab5be50c947bd7b91cfacdccb7f