Merge "Kill the app once a compat change override is changed." am: 9ff2a6a0 am: 0f2b2073 am: b8eac071 am: a22d2ff7 Change-Id: I47b693448da20cc6439c3d83d736258b84860ce1