Merge "Fix Vts errors" am: 570b0cbf6a am: 243e4dd831 am: 4ee27ea19c
am: 946a34c4f6

Change-Id: Iafb383132b70474e2f377ac72b0d17118ae02d86