Merge "Add more APIs to light grey." into pi-dev
am: 2891fe6c61

Change-Id: I6a5adb83f866914959cd0db1a1dbc779e601014a