Merge "Tweak compat change override policy"