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

Change-Id: I7fe4307142c767c99654dad483f5b8003aa3d850