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