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

Change-Id: I4d9388f1a7ade3ed2b1e5b6fa1a65d07ee52f914