Reorderd migration

Change-Id: Idfe352861b81e10fb67b4b4ad94f0176242519dd