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