[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type...
[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: 83c87e50
am: e9644676 -s ours
am skip reason: subject contains skip directive
Change-Id: If80d093b4083a4d98b7ef528012827c3a29f4d8c