Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am: 8b4f17be85
am: 9d6cb20646

Change-Id: I40b3e211111afb40789c13bed940310a96f45fcf