Merge "Fix MessagingStyle parceling" into nyc-dev
am: bd35d45

* commit 'bd35d4503fe1a2a8010072a648314819b29b998f':
  Fix MessagingStyle parceling

Change-Id: I5483678d1992cef7a03ea773583dcdaa5c302e45