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

Change-Id: I999a544aca5805d3655419f5da6728058184d7a1