Fix merge derps

Change-Id: I67bdf46b1b6841f50a465ca0b167faee9869e140