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

Change-Id: If92301128dc1cb31ee6b0e8fdf7b2b05c75c9ade