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

Change-Id: I04e82a254d0dd090b4c76044bef15ecb001ce4ba