Merge "[Settings] Fix robotest build breakage"