Merge "[automerger skipped] Merge "Explicitly track incompatibilities with previous API versions" into qt-dev am: 8a7db027c1 am: 7feb4a1b29 -s ours am: 43e6222ef4 -s ours
am: a57c44d2e2 -s ours
am skip reason: change_id I3d9e78357f4d91b702d321eb1ce1e71bb90e478b with SHA1 2ffa847904 is in history

Change-Id: I75866fa8d5f19d60eb65ad523b3d3b718eabb8dd