Control of Thermal Energy Storage in Commercial Buildings for California Utility Tariffs and Demand Response