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

Change-Id: Ic9e887d9a021f7e2dc32b8e7d1c12e733e38f456