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