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

Change-Id: Ia5d52ac672e7c547e50be66b301ad9389bcf8db7