Merge "Mark path as non translatable" into nyc-support-25.1-dev
am: 00c43a2fb3

Change-Id: I8ce4ccc36fb1d88288f2a4f18012730dbd6954d4