am 074c1116: am 64d6bacf: am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge: 7ab0ac6  -s ours automerge: f8571c8a  -s ours

* commit '074c11161aecb1e0e1fc2e5db5588ca5519e4b46':