Merge "Fix checkstyle API."