am 5dd81c93: am d67ff2d5: Merge "Move ls implementation detail into ls."

* commit '5dd81c936eada0ad0be2e9857d726d2e3ab17e30':
  Move ls implementation detail into ls.