Merge "Fix Vts errors"
am: 570b0cbf6a

Change-Id: I8c27b992d93ac73067df5faa6a02713c01e44261