am f6852593: am cb42a40a: Merge "Clean up any/all stale partition tables." into mnc-dr-dev

* commit 'f68525931e1b9ab6938d87bb95a2fa7966f046c4':
  Clean up any/all stale partition tables.