Merge "Kill the app once a compat change override is changed." am: 9ff2a6a098 am: 0f2b207397 am: b8eac07194
am: a22d2ff7e9

Change-Id: I47b693448da20cc6439c3d83d736258b84860ce1