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

Change-Id: Ia466856897b22565206c4cad88ff193b88bc0c42