am a5e57d67: Merge "Accept whitelisted entries from any source." into jb-mr1-dev

* commit 'a5e57d6755c41d8161bd2de3b76cca6922d61202':
  Accept whitelisted entries from any source.