Merge "Remove global headers." am: 43be68ba2f am: 9185ac6837 am: a5b86ec778
am: 5837ce6278

Change-Id: I613d0eac42f48b221537424c7b16d10b51413384