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

Change-Id: I995f4a7476405cf536e94cc496790d28ef7f7eca