Merge "32535234: Make @NonNull work with @NonNullByDefault" into nyc-support-25.1-dev