Merge "Use current user isntead of system user if no --user parameter is...
Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev am: 693c69ca am: 9c20cc0e am: d69466ff am: 4be0fbae
Change-Id: Ida93baeb56ad1f9ef78d25912ff33c3e7dfd4985