Merge "Merge "Upgrade expat to R_2_5_0" am: 771d7033f1" into main-16k