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

Change-Id: Ib5dfc58a7d53e0732959083fa2e6fcfd6e66f29d