[automerger skipped] Merge "DO NOT MERGE - Kill apps outright for API contract...

[automerger skipped] Merge "DO NOT MERGE - Kill apps outright for API contract violations" into qt-dev am: 97f5b409 -s ours am: b79affb6 -s ours am: a81df45f -s ours am: 03b08254 -s ours am: a17c8d94 -s ours
am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 874c974f is in history

Change-Id: If31bf2bf638389c5a81bec5af83d61cdceb1df96