Fix migration errors.

Change-Id: Ibe78a15e2eec8a1576f36758cef65b8aed36c0ce