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

Change-Id: Ide2643599bea9e43111ab9427527f404d0aa6f83