Merge "Revert "Remove unused method downgradeDatabase"" into tm-mainline-prod