Merge "More light grey apis." into pi-dev
am: eb368af5b0

Change-Id: Id9952a143670b739becf3d45d2ef2f8dee6266c6