Merge "Put userId at the end of parcel"