Merge "Add more APIs on hidden API light greylist" into pi-dev