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

Change-Id: I1248ffbdaba1cb31c1ed0d589ad60103b1214aaf