; and (B) by redesignating paragraphs (3) and (4) as paragraphs (2) and (3), respectively. 506. Extension of service-in-grade waiver authority for voluntary retirement of certain general and flag officers for purposes of enhanced flexibility in officer personnel management Section 1370(a)(2)(G) of title 10, United States Code, is amended by striking 2017 and inserting 2025 . 507. Inclusion of Principal Military Deputy to the Assistant Secretary of the Army for Acquisition, Technology, and Logistics among officers subject to repeal of statutory specification of general officer grade Section 3016(b)(5)(B) of title 10, United States Code, is amended by striking a lieutenant general and inserting an officer . 508. Clarification of effect of repeal of statutory specification of general or flag officer grade for various positions in the Armed Forces (a) Retention of grade of incumbents in positions on effective date Effective as of December 23, 2016, and as if included in the enactment of the National Defense Authorization Act for Fiscal Year 2017 ( Public Law 114–328 ) to which it relates, section 502 of that Act (130 Stat. 2102) is amended by adding at the end the following new subsection: (tt) Retention of grade of incumbents in positions on effective date The grade of service of an officer serving as of the date of the enactment of this Act in a position whose statutory grade is affected by an amendment made by this section may not be reduced after that date by reason of such amendment as long as the officer remains in continuous service in such position after that date. . (b) Clarifying amendment to Chief of Veterinary Corps of the Army repeal Section 3084 of title 10, United States Code, is amended by striking the last sentence. 509. Grandfathering of retired grade of Assistant Judge Advocates General of the Navy as of repeal of statutory specification of general and flag officers grades in the Armed Forces (a) In general Notwithstanding the amendments made by section 502(gg)(2) of the National Defense