Merge changes Ib782690c,I0c5287f4

* changes:
  Add tests for shouldDisableSyncForUser
  Disable contacts sync adapter for clone profile