Merge "Fix header not set on initialization" into oc-dev
am: 388ceaa37a

Change-Id: Ia706458360372059715ea86873dbbefc854731d6