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

Change-Id: Ic2ecd75182b2c0536e723f03cb0ebae1b23c5b06