Merge "Improved Text transformations for notifications" into oc-dr1-dev am: 19dc697f33
am: 2d220942ce

Change-Id: I7d6e7c755431dad906dcc091652a4d8f65f1281b