Merge "vts test for 1.2" am: 55e7774568 am: b0034bf5b9
am: 20ad34f084

Change-Id: Ia17ca32195c90b6e5b36abe25af82ad26117ec18