[automerger skipped] Merge "Address request license test failures [ DO NOT MERGE ]" into qt-dev am: 367befa3b7 am: 3a92c08fa2
am: 1a7a1b8df8 -s ours
am skip reason: subject contains skip directive
Change-Id: I8d6d4c23e5dff6b3b8871a5f069da0c688aa6369
This commit is contained in: