Merge "Expanding VTS test coverage" into qt-dev
am: 0407cfedac

Change-Id: Iaa34450022ff12d324dea97ed80a89fab2b50b94