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

Change-Id: I65e52239a3ade47f4845ce16c8a28423cdf51ac5