[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: adfb200a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic2eff382056ec1b7456cd2e3f46d3f2d606de453