Merge "Merge "If we fail to format a blank partition, try recovery" into nyc-dev am: 6846d22629 am: 2e7620594e" into nyc-mr1-dev-plus-aosp