am a43742ec: am 6813f29e: am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

* commit 'a43742ec620cb11faffa2c2b1847dc1accce5736':
  DO NOT MERGE Restore calling identity before checking permission