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

Change-Id: I4759f090f2917f9e84ec590695cf1734b0b27edf