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

Change-Id: I36c6813b549511e4921f2b4031c41891e085966e