Merge "More light grey APIs." into pi-dev
am: ce30fd3904

Change-Id: Id1f03630abdbaa4106405992f31f2e8bc072fe49