Merge "Fix failing VTS test cases" into oc-dev
am: d77a4a5585

Change-Id: I01f95ca5444957017d0ef47789c8355f98d475b8