fix mismerge

Change-Id: I079cae3534d1432d4bf4dbb2e934d00259aa181f