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

* commit '534e66690d89f9026a2964f6b4361734182988be':
  Move ls implementation detail into ls.