Fix merge derp

Change-Id: I3bfc2937d2fb60118aa18df7252f0c575f65e02a