Bug: b/35854026 Test: make RunSettingsRoboTests Change-Id: I5287e8c7b46a463cfa25659c756f6ca9175cb68c
2c826d7