Remove wrong merge.

Change-Id: I94ff5633226d37fcc2df39fdcb7ad313a523d435
1 file changed