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

Change-Id: I434ec812eacb56a70a4887bdca07c17ddabed988