Merge "Greylist requested hidden API" am: 473654c377 am: 9582cf7c1b
am: e10a083e57

Change-Id: Ie1b9085d2766bae6e4725ae50250cdb8b5efd9c6