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

Change-Id: I554473ad48b95a34f5c9f18a90bdd6f917dd8a93