Merge commit '6b3d716e2b6472eb7189d3220552280ef3d832ce' into master

Selecting a revision for Trusty which is Python3 compatible

Bug: 197031257
Change-Id: I065223f0da9b83c042b9b0cb416f477db2ccbbe5