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

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

Change-Id: I343eb6688340bfca5b1ee16a6a85bf1f3e5c7632