[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: cfeac66b -s ours am: 8ecc2874 -s ours am: 84cb13cf -s ours

am skip reason: subject contains skip directive

Change-Id: I3cdc7cdff22c7a7cefe8febd9dbf0a692a212975