Merge "Move from GROUP_ID to LIBRARY_GROUP annotations" into nyc-support-25.1-dev