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

Change-Id: I471273fedb7e18f0edabd3e00094cdc2eee3b77e