preferred language diff; defragment diff

Change-Id: I7e47550323fe74cbfdb54ad941b679d15e63acb1