Merge change 21907 into eclair

* changes:
  Update storage size after expansion.