Merge "Fix broken MessagingStyle" into nyc-dev
am: 77b9c767d2

* commit '77b9c767d2704465ad64405e96fee7ac204950ab':
  Fix broken MessagingStyle

Change-Id: Ib8694070141a447f5df2bf22ee9d6f61adcb8812