[automerger skipped] Merge "Add more light grey APIs." into pi-dev am: ac013ae464
am: 4a696f626b  -s ours

Change-Id: I15a3450d4cab8a65a860ef9da417deadcd6bfca0