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

Change-Id: If15e85a9b97cd8143d19c5dc0c2abaa435b795d1