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 'f8571c8a170f0cb8341b3e2adda306bb709b824a':