fix merge error

Change-Id: I6e5ec61930b4f3187317af1b802b4d98af72e181