Bug: 36021111 Test: make RunSettingsRoboTests Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2c826d7