Merge "Add more API to light greylist" into pi-dev