These headers are now set by Zero.

The corresponding change has already been deployed.

Change-Id: Ib9873ffd22a3cedbfbecacf977ccb4af89a64987
Merge "These headers are now set by Zero."