merged in migration code

Change-Id: Id526ba721ba3c531f75768f2d5552189d7e1e3c5