Fix merge error

Change-Id: I2c4c80a3cdbafeb3036d6c645260f2ec0bfdbcd8