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

Change-Id: Iab04e835155f6884f1f7039563e6981c7cea4c01