No need to reformat cherry-picks; we should have caught this in the initial review.  I will look into Checkstyle WhitespaceAround mode to prevent further occurrences.