Merge "Fix VTS tests" into pi-dev
am: aca8ddd319

Change-Id: Ifc2c7136647bb6e93a652f66a5838cb7138c648b