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

Change-Id: I2d51f4aa536cfa4d0c4d7278252053f00d0851f6