Merge "[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev am: d3b53e080d am: 1ac726e718 -s ours
am: 2a2a283a17 -s ours
am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 369246b4cc is in history

Change-Id: I9fe65fcffeb55471ec7f00621de7e472d77fac78