California governor makes some water restrictions permanent