Merge "DO NOT MERGE: Required platform_testing changes for merge of tradefed repos into qt-dev." into qt-dev