Merge changes from topic "parameterized-vts-tests" am: a3c1ad15b2 am: 0ba84cda7a
am: 55ae73fe0d

Change-Id: Icc2f07d9e8542e6eecb021e2514a042bf6707eb7