Merge change 25666 into eclair

* changes:
  Save message size