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

* commit '2d3c0c05e9cce7bad6afd3ceacca85b297367894':