Merge "Remove FIDTRIM." am: 35829f3968
am: c1d81682e1

Change-Id: Ic16dc5e6347a5cfbe444401b5374c7682db551e4