Merge "Check for null when updating header" into oc-dev
am: 010484f7c3

Change-Id: I902a5339f0d62ff14e2f9aa43eae7036d98c45e1