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

* commit 'd0a55f2ecb3371291ef086f737c1f5722ee995e7':

Change-Id: I248e7e08680695e7103ab099b4ecbdc088b9dfca