Yep, that's it. It would be even better if they put a porta-pottie or two near there.

I usually go to the trailhead lot about 1/8 mile farther along Mt. Hamilton Rd on the left, there's a pp and a water fountain there.