am ee7e1479: am 51ea897f: am 470f3a98: 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
automerge: fd9ba59  -s ours

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