am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev

* commit '20b338d949e6995853f37960241af010db7c8e40':
  Restore calling identity before checking permission