[automerger skipped] Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev am: 99c07af2bf
am: bf54f5ec8b -s ours
am skip reason: subject contains skip directive

Change-Id: Icc982cf37d14446ad0a988bcf46def7b7387d56b