Merge "Add checkstyle:off flag"