fixing small merge error

Change-Id: I2a0fa5bae4064a7fa8116d7b930b69cbee2404ed