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

Change-Id: Ic98c3165d78897c9c7200c613934137d06b26f8b