[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: e447c041 -s ours
am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 a79b6ba5 is in history

Change-Id: I11021f12405d53b2ee40557a986bb949b5df8321