Merge "COW device initialized by zeroing the whole first chunk" am: e88b568442
am: 4b2d972365

Change-Id: If041709f88aa52ceb3a3a640a4d1cad10a4be2de