Merge "DO NOT MERGE: Change getFragments() to return List instead of Collection" into nyc-support-25.4-dev