Fix checkstyle errors (#11289)

Change-Id: I9d2282a10fdea7064f28cb977cd58f9dc8a8bc4a