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