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

Change-Id: I23f86100863c719f4d6c9540545fba825f1590bf