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

* commit '3617eb6c97c41c4e9f4120d9eac5ce1730506d3e':
  Backport path validation changes.