Merge changes from topic "Correct subId in divideMessage()" into qt-dev am: 3aa54b1fff
am: 8fd3c26074

Change-Id: I06b8bc4d35ca67aa9164073584948d17c4b1d1f0