; (2) in paragraph (2) by striking State, local, or Tribal law and inserting Federal, State, local, or Tribal law ; (3) by redesignating paragraph (2) as paragraph (3); and (4) by inserting after paragraph (1) the following: (2) section 920 or 920b of title 10 (article 120 and 120b of the Uniform Code of Military Justice); or . 513. Coast Guard Academy room reassignment Section 1902 of title 14, United States Code, is further amended by adding at the end the following: (g) Room reassignment Coast Guard Academy Cadets may request room reassignment if experiencing discomfort due to Coast Guard Academy rooming assignments. VI Amendments 601. Amendments (a) Prohibition on entry and operation Section 70022(b)(1) of title 46, United States Code, is amended by striking Federal Register and inserting the Federal Register . (b) Port, harbor, and coastal facility security Section 70116(b) of title 46, United States Code, is amended— (1) in paragraph (1) by striking terrorism cyber and inserting terrorism, cyber ; and (2) in paragraph (2) by inserting a comma after acts of terrorism . (c) Enforcement by state and local officers Section 70118(a) of title 46, United States Code, is amended— (1) by striking section 1 of title II of the Act of June 15, 1917 (chapter 30; 50 U.S.C. 191 ) and inserting section 70051 ; and (2) by striking section 7(b) of the Ports and Waterways Safety Act ( 33 U.S.C. 1226(b) ) and inserting section 70116(b) . (d) Chapter 701 definitions Section 70131(2) of title 46, United States Code, is amended— (1) by striking section 1 of title II of the Act of June 15, 1917 ( 50 U.S.C. 191 ) and inserting section 70051