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

Change-Id: Ied38732abfa645dcdc5c1f55c56836ec2b8f4cbe