Merge "Greylist APIs which apps can resolve to at runtime" into pi-dev am: 0d130cbc86
am: 4517763931

Change-Id: Ic659bafb2d3283499b7d0cb71fa7244f6c66eada