am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before...
am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge: 7ab0ac69 -s ours
* commit '7ab0ac69':
DO NOT MERGE Restore calling identity before checking permission