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

Change-Id: I0e0bed76a75e509be722f4fd4e14762fc3e888c2