Merge "Preserve compatibility for makePathElements" am: 0b2c3a62bb
am: 68df35c09c

* commit '68df35c09cbc7c68b7e58d868dc5e601a087ef7b':
  Preserve compatibility for makePathElements