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

Change-Id: Iad4482a81d775fad58df38f27a4fff2395e53510