Merge "Preserve compatibility for makePathElements"
am: 0b2c3a62bb

* commit '0b2c3a62bb37b7be6b1351c1b6754a9170cff4d1':
  Preserve compatibility for makePathElements