[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 skip reason: subject contains skip directive

Change-Id: I203e73823d42e0e82c5b0bd331e9e7baca21f4e4