Merge "Using the new bidi unicode wrapping now for messaging style" into nyc-mr1-dev
am: 5e7e4dc75c

Change-Id: Ib9fa85c4a3bb65dd4c643216acee5957123be5f0