Fixed a mismerge

Change-Id: I230d5961345b0ed4ce440bb52b2b13994a6e071f