[automerger skipped] Merge "Q card." into qt-dev am: 13de667fa6
am: 69a42c8217 -s ours
am skip reason: change_id I4865024a14b6a78e7a043c56d2330b5f9dd214c6 with SHA1 8c7b8cbd39 is in history

Change-Id: I3c255ae2707c505a27e2638105ec8e7e189674f3