am 470f0b3f: Merge "Avoid segv by checking argc in "storage user <mountpoint>""

* commit '470f0b3ff46493b4a46b3599db33a29e94615d30':
  Avoid segv by checking argc in "storage user <mountpoint>"