Fix my bad conflict fixing skills.

Change-Id: I0862a0f2624ddd816c7a37854ac2e90896fea68f