Merge changes I35eddd24,Ia2c7093a into pi-dev

* changes:
  Add more hidden API to light greylist
  Add more hidden API to light greylist