; 130 Stat. 615) is redesignated as section 44814 of chapter 448 of title 49, United States Code, and transferred so as to appear after section 44813 of title 49, United States Code, as redesignated by subsection (b)(1) of this section. (2) Technical and conforming amendments Section 44814(a), as redesignated, is amended by striking this Act and inserting the FAA Extension Safety and Security Act of 2016 . (d) Operations associated with critical infrastructure (1) In general Section 2210 of the FAA Extension Safety and Security Act of 2016 ( Public Law 114–190 ; 130 Stat. 615) is redesignated as section 44815 of chapter 448 of title 49, United States Code, and transferred so as to appear after section 44814 of title 49, United States Code, as redesignated by subsection (c)(1) of this section. (2) Technical and conforming amendments Section 44815, as redesignated, is amended— (A) in subsections (a), (d)(2), and (e), by striking section 333 of the FAA Modernization and Reform Act of 2012 ( 49 U.S.C. 40101 note) and inserting section 44805 ; (B) in subsection (c)(2), by striking , United States Code ; and (C) in subsection (d)(1), by striking this Act and inserting the FAA Extension Safety and Security Act of 2016 . III Other matters 2151. Federal and local authorities (a) In general Not later than 180 days after the date of enactment of this Act, the Comptroller General of the United States shall— (1) conduct a study on the relative roles of the Federal Government and State and local governments in regulating the national airspace system, including unmanned aircraft systems operations