Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data...
Merge "[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b am: 2f373bfb -s ours
am: c84de559 -s ours
am skip reason: subject contains skip directive
Change-Id: I293c2fcb63d31615b2aa508b3b56d0cb20f2cee7