Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev am: 693c69ca30

Change-Id: Iba374804264a6b79708046dbcd8843da0217f053