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

Change-Id: I2bbd23c7600dc608abd42cb350324cd42cecc00f