Merge "Remove global headers." am: d6e326fc56 am: d70e6e1fae am: 4a08739b2a am: 2ced5dde50
am: 39b2b29ff4

Change-Id: I2d85c48af3d3da895038edb3cfe6178a45c1d679