Merge "Restore downgrade logic of recreating schema" into tm-mainline-prod