Merge "Move vm-test-tf over to D8." am: 311a8d6019
am: 6e2eac1466

Change-Id: I0b65f8f0c1eca6965d752e443a8c83dc41cc7bf3