Merge "Fix Vts errors" into oc-dev
am: 93d5836949

Change-Id: I9c3b7db8e75cf15f3231c60379bf0b1808cea972