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

Change-Id: I249e968422e6432e4149d1afb791553888d4bb15