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

Change-Id: I0c34a29ed77fced650bf8d0b1d0a0120a4d8aae4