Merge "Add API to light grey." into pi-dev
am: 3e264bf0b8

Change-Id: I8de77af9b5029c845f25ea169027b045157153a3