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

Change-Id: I2eef6f121bd4e247ae403ebe89f73a9fa3ccfb19