Merge "Fix invalid use of @note for doc builds."