Merge "Fix checkstyle issues in JavaScript."