am 8c12bd87: Merge "Tag the whitelisted entries in native code." into jb-mr1-dev

* commit '8c12bd87ccd649732a40cf6aae36e82e92e2edb4':
  Tag the whitelisted entries in native code.