Fix migrate errors.

Change-Id: I3d76cc860ab752b489ff0a3489be3e710692663a