[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: 5676c5ee -s ours am: 1effbf0e -s ours
am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 38567a60 is in history

Change-Id: I1a394dc1c51162be1e30bd66dc86f2f95f54c0d5