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

Change-Id: Ie3ea961616a30a753bb146cb36e3c78e4b54218d