Merge "Remove global headers." am: d6e326fc56
am: d70e6e1fae

Change-Id: If3eefaa06b046320fd029c85fb56017ba9fee41a