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

* commit 'a821d50bd43809414521590ebe65601b823f8095':