EXP-16. Fix the build/scalastyle issues.