fix merge error

Change-Id: I2bf16d89ca36c5446c4deca25f6fd67fb0ce0444