(no-ticket) Fix always enabling spliteval

Change-Id: Icf5ba971712f18bc87ef29ee19507fe30e778343