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

Change-Id: I140fa52a6a37e47d53fa96446765b2fcd558917f