Merge "Fix Vts errors" am: 570b0cbf6a
am: 243e4dd831

Change-Id: I94cfadb942dd7b476cb17b2d9f5a3857dadf9857