am d0fd622e: am d96863a0: Backport path validation changes.

* commit 'd0fd622ed8507e0af5d1eec42c326c11645cb62e':
  Backport path validation changes.