update linktrail from mw

Change-Id: I81d29851d0f05674d0cce03d9ad045d339fa903d
Merge "update linktrail from mw"