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

Change-Id: Id6b9bfe55dac593ade058aae276365428a181cdb