Merge "Fixing various broken javadoc comments in framework."