Merge "Fix adb command for multiple users" into sc-dev