Merge "Remove workaround to remove FlaggedAPI in ump" into main