Merge changes If285d71a,Iffe5be7c

* changes:
  Revert^2: Build dark greylist from public + light grey API
  [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"