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

* commit 'c015f8e1eddbe12f94023e58235f76e7f688c745':
  Backport path validation changes.