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

Change-Id: I56bb063e1e6ff9003f852a47db355519dec22a69