Merge "modify checkstyle error for tca test"