Adds missing EXT_TX checks

Change-Id: Ia0ca39c9041f17da0b7f522e55868498f31de848
Merge "Adds missing EXT_TX checks" into nextgen