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

Change-Id: I8db35b81879915af7974630acf9e4f962c821452