Merge "PartitionCowCreator accounts for extra extents" am: adb98df120
am: dff772c226

Change-Id: Idbaa757e45228110b9de9ae5874d9a75918face5