[automerger skipped] Merge "Avoid using usap when wrap property set." into...
[automerger skipped] Merge "Avoid using usap when wrap property set." into qt-dev am: cbd4908c am: 9ab82236 -s ours
am: 8587f166 -s ours
am skip reason: change_id I5f25030ce8e667d175712796c0950f38baa2532d with SHA1 86bd25d5 is in history
Change-Id: I9ce522e1cab8fa9e0ec9c7a7b3186601adbdb67a