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

Change-Id: Id09a2eabdda8a6fcd3e41760c0c4ddfa418af412