Merge change 24508 into eclair

* changes:
  Addressed reviewer comments.