Merge "Optimize AugmentationIdentifierGenerator.getPathArguments()"