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

* commit '2e7620594ef9a1353d0cc191e5e4172f88353221':
  If we fail to format a blank partition, try recovery

Change-Id: Ia51650680b7450d767ed4f9bfeb801f1c625b7b0