am ef931546: Merge "Add hacks for better handling count value during migration."

* commit 'ef931546a0236ac2e24ec78f2830e3c36d56775d':
  Add hacks for better handling count value during migration.