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

Change-Id: I633e36282ff02a18dda2d6a51416556f5922ccdf