Merge "Light grey some APIs." into pi-dev