am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev

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