Fix merge derp

Change-Id: I2208936324add08d6b4179d7f315da189cf7df0a