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

Change-Id: I1f3ba7c42bb0a99ad3abc0c8b2864b8fbfd5160e