Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7
am: 649f3bf73f

Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d