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

Change-Id: I70893fe2ef30aa52384c8f5834d76657dca22e7d