Handle enchant migration on second restore (LT-15518)

Change-Id: Ie2e1d9d6e3dafc189913d27bebe730d8fc722be1