Merge "Fix double bolding" into oc-dev am: 1b7e17b135  -s ours
am: e99f3c3c77  -s ours

Change-Id: I4700cfb3a3b790c181bad48595831b85e9657a53