Yes, UC HS GPA recalculation uses grades from 10th and 11th grade.
CSU HS GPA recalculation is the same as UC weighted-capped, except if the student took college courses while in high school. A transferable semester college course is 1 course and grade for UC, 2 courses and grades for CSU (college courses count as honors for both UC and CSU).