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

Change-Id: Ia5e4cf6a43841b12e50b989ecbc0691a3d7675ee