Bug: 32996243 Test: RunSettingsRoboTests Change-Id: Ie537bbcc35a96a63251e46f84b57c0a861b9d013
Change-Id: Ib6c06de9f942c3bb06384947f6b1923b33e511bc Fixes: 32972964 Test: make RunSettingsRoboTests