Merge "Remove some global headers." am: 7285e9adce am: dbd5569923
am: de24a52a5b

Change-Id: I445afde128d08d70dd2109f0b0622792811910cd