Merge "Fix composer@2.3 VTS tests." into qt-dev
am: 16b5d8a94a

Change-Id: I12bc6c0c1e5f532487bdf47db89fe955fdfb9ddb