Merge "Remove a stale, unused header"
am: d6a74eb9e0

Change-Id: I00b92b66b1d358f0406fdb6e0a8b1b9c1d7947f1