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

Change-Id: I1ffe50fb847f8986b41fabe9ee0c41fb72558ed9