California outlines plan for scaled back giant water tunnel