Merge "[Settings] Fix robotest build breakage"
am: 6c9b9f41d6

Change-Id: I0b52f783c5dd46a06ebfb0a51650666c0e52b961