Merge commit '10739aa26051a5d49d88132604539d3ed085e72e' into master

Selecting a specific revision for Trusty usage

Change-Id: I8ccf0002aa6c69bf68f6f3b13e394a60b76d50f8