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

Change-Id: I3ed89c13301ce07e5fc8ac0be59f33dbf4be492b