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

Change-Id: I2ceaeb21542d37af4304eee76ee8a377dbb0025d