am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge: 7ab0ac6 -s ours
* commit '7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
DO NOT MERGE Restore calling identity before checking permission
This commit is contained in: