Merge "VTS tests should be static" into pi-dev am: 318d3c4ff6
am: c9e570ac24

Change-Id: I81b38d4855730df19fbf7c03d6255e29def0e53a