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

Change-Id: Ib35487ad1645737056935cbf3c60b95e3de16a9c