DB migration ordering fix

Change-Id: I7bd45a6ee76dea13e09e6a3f27a3c5949709fe48