Merge "DO NOT MERGE - Kill apps outright for API contract violations" into pi-dev