More work.

Change-Id: I6e05062091adf664c29c41150b490b3e461cde0f
More changes.

Change-Id: I26219b352fa412a9ce2b4c93a43eac3c6ef4422c
Persist chunks with metadata.

Change-Id: I6deb53db0a7eb7e9d7c2e1485c4cc7a3ba4c550a
Even more work.

Change-Id: I984b87ba48b32056b7ab7276f054331defd173d3