am a7096004: am 911ba269: Merge "Add -i option to toolbox cmd ls"

* commit 'a7096004f220dd7578d7b2e26a3513fa5efc0fc1':
  Add -i option to toolbox cmd ls