Merge "Add new overridable annotation to platform compat"