fix mismerge

Change-Id: I6cfd5fdc489c3e1cece8674bb9c1f34a62578f41