am 143ac135: (-s ours) am 7a7d3a0e: am f9c96522: am 6959a94f: am 336fc1ff: am 7ab0ac69: (-s ours) am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '143ac135':
DO NOT MERGE Restore calling identity before checking permission