Merge b/strong and i/em annotations

Like we do with code/tt.

Change-Id: I4ad83c727b6abefdec915bd8f24331b3841cb3d8
Merge "Merge b/strong and i/em annotations"