am 95b85c15: am 9a2793e0: 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
automerge: 3308ad4  -s ours

* commit '3308ad42fa162fbdda26337f64e00603b1388ec7':