Create variable names that are CheckStyle compat#5103

CVdV-au wants to merge 3 commits into

google:mastergoogle/error-prone:masterfrom

CVdV-au:cvdv-au/pattern_match_classnameCVdV-au/error-prone:cvdv-au/pattern_match_classnameCopy head branch name to clipboard