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

Change-Id: I833375986a5d388a64ca9e19cb05aa4672e6063a