Merge "Revert "Specify cell0 db creation""