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
* commit '64d6bacf':
DO NOT MERGE Restore calling identity before checking permission