Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8
am: d0a55f2ecb

* commit 'd0a55f2ecb3371291ef086f737c1f5722ee995e7':
  Remove pre-N db after successful migration

Change-Id: Ieabdea8b1093f46fcf54e43f0773c0c7175f0428