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

Change-Id: I549c0de53ef9f1d3eb820ef6e01c1885d0a50dce