Merge "Fix some issues found by new doclava linter." into oc-dev