[automerger skipped] DO NOT MERGE Allow for HTML styling in mobile data type content descriptions am: a3b5dd1b89 -s ours am: b069e83cfe -s ours
am: eccf86be7f -s ours
am skip reason: subject contains skip directive

Change-Id: Ife4d94ce942afae9bd757afdfec251a11361d12f