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

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

Change-Id: I0774896753c75027e0b384184c9fd2f3a80055a4