Merge pull request #1239 from arve-android/trusty-fixes

Trusty fixes