Merge "If we fail to format a blank partition, try recovery" into nyc-dev