Bug: 36657192 Test: m RunSettingsRoboTests Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
2c826d7