Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev am: 693c69ca30 am: 9c20cc0ec7 am: 0e49358f4a am: e2b6b67032 am: 834cab296c

Change-Id: Id32652d1f8ffebb7c34d902c3906bdd432c109d3