Merge "Handle string resources containing html tags for style" into rvc-dev am: 25c1fbdc90 am: 1fd525cff8 am: bdd0a07518

Change-Id: I9f2fcca239c534bd0ac52ec573b62f76a1b3ef2d