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

Change-Id: I81f736acca0983325615563c63f5669952fe26fb