Fix merge derp

Change-Id: I7fc871e87a2cc1c6dfeef5f1d32214bd127b4a06