Set not null after doing the migration

Change-Id: Icefe48acd0cff8ccf2606825e960fc28ecc18a9f
Merge "Set not null after doing the migration"