am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev

* commit '9a25c012915f2209fff1479b246ae8eba38c3eff':
  Part of fix for TEE resource leaks when app crashes