Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev