[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: 5b1475df -s ours am: d076b37f -s ours am: d06bae85 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe284696567e533833e8157e5737aa4af1db89a0