Merge "Add an API method for clearing compat overrides on release builds"