Fix migration issues.

Change-Id: I27f22bf890fe0317b20527d45d136548aa4aee3d