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