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
Change-Id: I1968e163d53d067862898c1345116ac341d55169