Merge "Enable Trusty Gatekeeper@1.0" am: feae89302e
am: 6f400e949a

Change-Id: If7bc0f7456a2dfdb02486a99fd2296cfbe8fd5da