[automerger skipped] Merge "DO NOT MERGE - Kill apps outright for API contract violations" into pi-dev am: 4bcf846f7a -s ours
am skip reason: subject contains skip directive

Change-Id: If8d5b2092fab6b618c336228be1eb80a3a95081a