patches: fix merge conflect

Change-Id: I2ccc5f351b5c68cf1fa0c1251accd04d33317089