Merge "Allow Overrides on CompatChange"