Fix merge derp

Change-Id: I7e7012422ea017dbe0e66790a9c1e40a0a22d878