fix conflicts

Change-Id: I2d9ed0de0a17ee9ad0ab4a831e10a34864282620