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

Change-Id: I55813abb627487337b17c7e90e734687812f0485