am 940b951d: am d0fd622e: am d96863a0: Backport path validation changes.

* commit '940b951d430a3d03e0cd84c7d73185f198e9e1dc':
  Backport path validation changes.