am ea113f30: am d8729c59: Removing an unused header file and a stale forward...
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 'ea113f30'
* commit 'ea113f30':
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.