Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7

Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c