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