am 0a63d817: am 48dad949: (-s ours) 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 '0a63d8176d8c3099c2e40bdbb00220f5aeeff69e':
  DO NOT MERGE Restore calling identity before checking permission