Merge "Fix bad Java docs in View.java" into oc-dev