Fix conflicts

Change-Id: If1d4e61b76099319a9bd2ba0899a0ed7375580c2