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

Change-Id: If6ce5c989102c8fb6cdc1fa82cde79817f6c3423