; and (2) by adding at the end the following: (f) Application to other individuals The whistleblower protections afforded under the preceding subsections of this section shall apply to the following individuals in the same manner and to the same extent as such protections apply to an employee described in subsection (a): (1) Employees, contractors, and subcontractors of any entity that manufactures or otherwise produces aircraft and holds a production certificate under section 44704(c) of title 49, United States Code. (2) Employees, contractors, and subcontractors of any repair station operating under part 145 of title 14, United States Code. (3) Employees, contractors, and subcontractors of the Federal Aviation Administration. (g) Application of motor vehicle safety incentives and protections The incentives and protections afforded under section 30172 to an employee or contractor of a motor vehicle manufacturer, part supplier, or dealership shall apply in the same manner and to the same extent to individuals described in subsections (a) and (f) of this section. (h) Rights retained by employee Nothing in this section shall be deemed to diminish the rights, privileges, or remedies of any employee under any Federal or State law, or under any collective bargaining agreement. (i) Nonenforceability of certain provisions waiving rights and remedies or requiring arbitration of disputes (1) Waiver of rights and remedies The rights and remedies provided for in this section may not be waived by any agreement, policy form, or condition of employment, including by a predispute arbitration agreement. (2) Predispute arbitration agreements No predispute arbitration agreement shall be valid or enforceable, if the agreement requires arbitration of a dispute arising under this section. . 7. Additional requirements for organization designation authorizations (a) Issuance of certificates (1) In General Section 44702(d) of title 49, United States Code, is amended— (A) in paragraph (1), by striking subparagraph (B) and by inserting