Merge "Add APIs to light grey." into pi-dev am: 6b3e711eb4
am: 0a94c2c4c6

Change-Id: I792a5d5137aa04de827e18c6415f3e9d3e5905a0