Merge pull request #1239 from arve-android/trusty-fixes
authordavidcunado-arm <david.cunado@arm.com>
Wed, 7 Mar 2018 10:43:56 +0000 (10:43 +0000)
committerGitHub <noreply@github.com>
Wed, 7 Mar 2018 10:43:56 +0000 (10:43 +0000)
Trusty fixes


Trivial merge