Merge "Merge "Use current user isntead of system user if no --user parameter is passed" into rvc-dev am: 693c69ca30 am: ebeb55eb4d" into rvc-d1-dev-plus-aosp am: 0e8c63bbaf am: 331184de63

Change-Id: I553481f8e41bbfd7745ff25e48cb64e5e8f38fdb