Adding tighter first run checks for migration clings. (Bug 12626290)

Change-Id: I09fc95c9a3d50ce57f9140e89da2ff4856807f92
2 files changed