Merge "Add more APIs to light grey list" into pi-dev