[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: 421d3ffe -s ours
am skip reason: Change-Id I94d9de50bb03c33666471e3dbd9c721e9278f7cb with SHA-1 38567a60 is in history

Change-Id: I3a40ecd4e25ecbe79eccb64e94d4ac9b291c05cb