Merge "Add extra compat change overriding methods."