[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: 9e37e79b -s ours am: 88f44659 -s ours am: 0ced3766 -s ours
am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 a79b6ba5 is in history

Change-Id: I5e4a7067bb6a60c3a52dab5260a6eb6bc488247b