fix merge error

Change-Id: I1feb626675f78187e7535922d7de467ea52c39e1