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

Change-Id: I0a6d2eb8254df9785e16273ed300fba31bfa8a50