fix merge error

Change-Id: Id8db2bff0dbcd9ad923248d3da9b16f0d7cab5cb