Merge "Change --user argument from "optional" to "required"" am: 05c9151eb4
am: 7cecf95344

Change-Id: I3d90b7dbd5308c874ef135c0848c2750de948f06