am ea113f30: am d8729c59: Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.

Merge commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e'

* commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e':
  Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.