Merge "Enable Trusty Gatekeeper@1.0"
am: feae89302e

Change-Id: I66759c486a482cdb29836ce17519ae0a4fe79a2a