Merge "vts test for 1.2"
am: 55e7774568

Change-Id: I1c45e47a0fc14bb9f15f3f998c5a3419f5be69fb