Merge changes from topic 'fix-vts-test' into oc-dev am: a64eb7c698
am: 8d0e10f08d

Change-Id: Ic2a67dc296c9f85f51925ce10e684acdb140fd6e