; 46 U.S.C. 51318 note) is amended— (1) by striking Not later than and inserting the following: (1) Not later than ; and (2) by redesignating paragraphs (1) and (2) as subparagraphs (A) and (B), respectively, and adjusting the margins accordingly; and (3) by adding at the end the following: (2) For the purposes of this section, vessels operated by any of the following entities shall not be considered commercial vessels: (A) Any entity or agency of the United States. (B) The government of a State or territory. (C) Any political subdivision of a State or territory. (D) Any other municipal organization. . (b) Passenger records Section 51322(c) of title 46, United States Code, is amended to read as follows: (c) Maintenance of sexual assault training records The Maritime Administrator shall require the owner or operator of a commercial vessel, or the seafarer union for a commercial vessel, to maintain records of sexual assault training for any person required to have such training. . (c) National Oceanic and Atmospheric Administration Section 3134 of title 40, United States Code, is amended by adding at the end the following: (c) National Oceanic and Atmospheric Administration The Secretary of Commerce may waive this subchapter with respect to contracts for the construction, alteration, or repair of vessels, regardless of the terms of the contracts as to payment or title, when the contract is made under the Act entitled ‘An Act to define the functions and duties of the Coast and Geodetic Survey, and for other purposes’, approved August 6, 1947 ( 33 U.S.C. 883a et seq.). . (d) Annual payments for maintenance and support Section 51505(b) of title 46 is amended to read as follows: (2) Maximum The amount under paragraph (1) may not be more than $25,000, unless the academy satisfies section 51506(b) of this title. .