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

* commit '654174e2af9deba47c3e421638b2ae9407270d15':
  If we fail to format a blank partition, try recovery

Change-Id: I03c7be4559c8168579edbb40f98b927c4902deb5