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