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

Change-Id: Ic5d4ccd97a27c2ac2e31e3235df815297607f528