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

Change-Id: I6f14ecf9149b091ab08847d1ec66fe96f8665cd2