fix mismerge

Change-Id: Iec8fb1d8a74cba44240903e97937c29d9d3fa2a4