Merge "Merge "Fix vts tests:" into oc-dev am: 14b34e19d6 am: 01cb1ff6d7  -s ours" into oc-dr1-dev-plus-aosp
am: 824fe31298  -s ours

Change-Id: If2a9f01485c53552008a8e6934433d6ec6f91d93