Merge "Temporarily disable vm-tests-tf" am: 987d12a5ce
am: 87f40ae2df

Change-Id: I78b8b3b3ab40b52a36c1395011d051d9f06573a0