am a537230a: Merge change 21907 into eclair

Merge commit 'a537230a989cd58570cdb5ebf0f75346fe79515b'

* commit 'a537230a989cd58570cdb5ebf0f75346fe79515b':
  Update storage size after expansion.