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

Change-Id: I934c6a064b9f593710e6ca558be8f95926c6ebcc