base

Merge change 27457 into eclair

* changes:
  Added code style fix that actually did not get submitted in 2nd patch of previous change.