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

Change-Id: I6680f7c27a2616a9fd8493bcc3d92db9d1a73144