future proofing the trusty/precise changes

Change-Id: I09e2f41ffc47c1c30859e6115ce977ab8cb29e50
Merge "future proofing the trusty/precise changes"