Revert "Disable Collection for server move"

This reverts commit 70bea9f364eb5b63e8230391aec8ffb05b2f848f.

Change-Id: Ib3f94619cdae5f3cda666f50296433638284b7d5
Merge "Revert "Disable Collection for server move""