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

Change-Id: I6a1e3a93dc448d93886f1471ca6e3371364ae36a