a general stream adjudication, on or before the Enforceability Date, except to the extent that such rights are recognized in the 2007 Agreement and this Act. (B) All claims for damages, losses, or injuries to water rights or claims of interference with, diversion, or taking of water rights (including claims for injury to lands resulting from such damages, losses, injuries, interference with, diversion, or taking of water rights) within California against the State, or any person, entity, corporation, or municipality, that accrued at any time up to and including the Enforceability Date. (2) Waiver and release of claims by the Tribe against the United States Subject to the reservation of rights and retention of claims under subsection (c), the Tribe shall execute a waiver and release of all claims against the United States (including any agency or employee of the United States) for water rights within the State of California first arising before the Enforceability Date relating to— (A) water rights within the State of California that the United States, acting as trustee for the Tribe, asserted or could have asserted in any proceeding, including a general stream adjudication, except to the extent that such rights are recognized as part of the Tribal Water Right under this Act