Tightening migration conditions. (Bug 11973614)

Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
3 files changed