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

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