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

Change-Id: I56fe3d995c7c006ee1450d3bfd372f41ccc0601f