Fix migration errors.

Change-Id: Ia0e45bc328729b44f26e8741cad60812003ff051