Merge "Handle string resources containing html tags for style" into rvc-dev am: 25c1fbdc90 am: 892785d41e am: 44e4dd1f09

Change-Id: Ie6b689ae1163bbfe3ba8ebcaba877057f26215a1