Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev