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

Change-Id: Ia63caab168bae4cebdcb0da4b5f9d601beec5f66