Moving zero specific code over to Zero

Should be merged at same time as
https://gerrit.wikimedia.org/r/#/c/57553/

Change-Id: I1f0fe8ad1ea2b52031079f52d6e25b5fcf44d7af
Merge "Moving zero specific code over to Zero"