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

Change-Id: Id03c8749461bb4df9a53c2508a2b6e1f1bd60665