Merge "More greylisted APIs." into pi-dev am: 6d71fa791b
am: 28d10e9129

Change-Id: I94f662909f15a872e477a9d4220d721381a75acf