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: 48dad949 -s ours
* commit '48dad949':
DO NOT MERGE Restore calling identity before checking permission