[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: 3a42ce43 -s ours am: f179466c -s ours
am skip reason: subject contains skip directive

Change-Id: I66029bd99bfb574f86b570decb653362f4d006f9