[1/2] fix merge derps

Change-Id: I8f6500b2dc6c79bb3c17273f8b845e7851209dfe