Fix some merge fails.

Change-Id: I3f9110127f06995b3137d59a322b917c83806bed