am e57c5ae4: am 355d65b9: am c015f8e1: am 940b951d: am d0fd622e: am d96863a0: Backport path validation changes.

* commit 'e57c5ae4764ace4c6712655ccc007ce4c7eb6f3d':
  Backport path validation changes.