GitLab

- Disabling and enabling the type, which revealed a bug in the DTC.
- Conflict resolution, which revealed a bug in the worker.

BUG=643269

Review-Url: https://codereview.chromium.org/2339403004
Cr-Commit-Position: refs/heads/master@{#419222}