Fix merge derps

Change-Id: I2d40fa54e4fb6ab826d3cf438908820fe0290e28