Merge "A new workaround for the proguard issue for VDC/AVDC." into nyc-support-25.3-dev