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

Change-Id: I965e20c38e27f353948ac8acd5daecd7d6b8148f