Add hacks for better handling count value during migration.

Bug: 14425059
Change-Id: Ib050574aa7c4babd4285322a11c3af9be9fbab1e
2 files changed