Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev
am: 99c07af2bf

Change-Id: I83e8d4e286a5c9e36cafdf537cee31bf0df40657