am acff3464: (-s ours) am 671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]

Merge commit 'acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2'

* commit 'acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2':
  Don't increase partition size for ext4 user images. [DO NOT MERGE]