Merge "Fix issues related to checkstyle enforcement"