am ed2d3f42: (-s ours) am 258bf46e: support for per-partition fs_type (do not merge)

Merge commit 'ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be'

* commit 'ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be':
  support for per-partition fs_type (do not merge)