[automerger skipped] Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7 am: aea739b3f4 am: dbdf483f31 -s ours
am skip reason: Change-Id I98137a095cddf0fb4c600e1e09eef507bb750528 with SHA-1 709c0a1cc8 is in history

Change-Id: I638d603fa2c83058af3a393f3e88005c560fdc07