fix merge error

Change-Id: Ie149fb28dd744e5919df87109624865167bd4e7c