[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-qpr1-dev am: 19cffe42 -s ours am: b6e6858b -s ours am: 9ff7cd0c -s ours

am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 45a53e6c is in history

Change-Id: I631614e35870d8767f75603439485f7f9ebdcd6e