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

Change-Id: Ifb64f81199fa5e46832cd83edc75531fd05699f1