Merge "Mark path as non translatable" into nyc-support-25.1-dev