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