Merge change 23271 into eclair

* changes:
  Cleanup egregious style issues.