Merge "PartitionCowCreator accounts for extra extents"
am: adb98df120

Change-Id: I0df9eb0def72ea3fdcb1fa8b9c034010cabf21b5