Tightening migration conditions. (Bug 11973614)

Change-Id: I6d7417b705227472d035f428cbec933cc6dbf2ce
(cherry picked from commit e43a1e788223ab5a4405c5eeb0133ff57efbc768)
3 files changed