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

Change-Id: I854b8bb4df0d18b053193737c33f8a593ae53f1a