Further trunking bug fixing.

Change-Id: I000174a39c2b99af556d9ddf8ec1c4b22ca7ef95