; 121 Stat. 1686) is amended by striking and Hydrokinetic Renewable . (2) Section 631 of the Energy Independence and Security Act of 2007 ( 42 U.S.C. 17001 note; 121 Stat. 1686) is amended by striking and Hydrokinetic Renewable . 4. Marine energy research and development Section 633 of the Energy Independence and Security Act of 2007 ( 42 U.S.C. 17212 ) is amended to read as follows: 633. Marine energy research and development (a) In general The Secretary, acting through the Director of the Water Power Technologies Office, in consultation with the Secretary of the Interior, the Secretary of Commerce, and the Federal Energy Regulatory Commission, shall carry out a program to accelerate the introduction of marine energy production into the United States energy supply, giving priority to technologies most likely to lead to commercial utilization, while fostering accelerated research, development, demonstration, and commercial application of technology, including programs— (1) to assist technology development on a variety of scales, including full-scale prototypes, to improve the components, processes, and systems used for power generation from marine energy resources; (2) to establish and expand critical testing infrastructure and facilities necessary— (A) to cost-effectively and efficiently test and prove marine energy devices; and (B) to accelerate the technological readiness and commercialization of those devices; (3) to support efforts to increase the efficiency of energy conversion, lower the cost, increase the use, improve the reliability, and demonstrate the applicability of marine energy technologies by participating in demonstration projects; (4) to investigate variability issues and the efficient and reliable integration of marine energy with the utility grid; (5) to identify and study critical short- and long-term needs to create a sustainable marine energy supply chain based in the United States; (6) to increase the reliability and survivability of marine energy technologies