[automerger skipped] Merge "DO NOT MERGE - Kill apps outright for API contract violations" into pi-dev am: 4bcf846f7a -s ours am: a032a689a3 -s ours am: 344eb282cc -s ours am: 9e37e79bf3 -s ours am: 421d3ffea4 -s ours am: 5b1475df7c -s ours am: d076b37f89 -s ours am: d06bae858a -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe284696567e533833e8157e5737aa4af1db89a0