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: 0e49358f am: e2b6b670 am: 834cab29

Change-Id: Id32652d1f8ffebb7c34d902c3906bdd432c109d3