am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."

* commit '169d029c763a7e652e6d22ae42bb23707675541b':
  Switch init over to _PATH_DEFPATH.