Merge "Remove global headers."
am: 43be68ba2f

Change-Id: If894877bd176e71707627eba79a8328e9f5b683a