Merge "Avoid segv by checking argc in "storage user <mountpoint>""