Merge "Add hidden API used by CTS to greylist" into pi-dev