Merge "Divide a message text into correctly sized parts" am: 8f7157ca48
am: b9f65a87d1

Change-Id: I6652537cd578dde7dfa9145898cee5ee43a50ecd