Merge "Fix javadocs based on recent case consistency change"