Merge "Fix for user_id not assigned in clonedUser directories." into tm-mainline-prod