Merge "Hypenate ChronologyProtector HTTP headers"