Merge "Fixed Javadoc typos"