Merge "Merge "Minor fixes on VTS tests" into tm-dev am: 079b3790ac am: 0e8af9f273"