Merge "Fix some FRM checkstyle violations"