Fixes for TRDS 3.0 and new Actions.

Change-Id: Iffcf572b617c78e0efb532b90a200fd615d6a4b6