Merge "Add support for @EnabledSince compat changes"