am 2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev

* commit '2f4ad45d60aac5b2b025e9eac34e289d406645dc':
  DO NOT MERGE Restore calling identity before checking permission