[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 pi-dev am: 4bcf846f -s ours am: a032a689 -s ours am: 344eb282 -s ours
am skip reason: subject contains skip directive

Change-Id: I91334ed009a4025cc93f342a3ef3df7ee570aba9