Merge "Adding more APIs to greylist Test: None" into pi-dev
am: 54b8750b06

Change-Id: I5dfeb23223d24ca659906adee84e5be893053056