touch up non intrusive trds

Change-Id: I26b6d73c1c4daf7cb3bbf861c944f63efaab3545