COMP: Fix shadowed typedef warnings.

Change-Id: Iec322c066e588cb9fce3c2eaa978b189c769b336
Merge topic 'TubeShadow'

2777c9a COMP: Fix shadowed typedef warnings.