Merge "Re-init storage size on resume." into oc-mr1-dev