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

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