Backport "Fix stale top level synthetic package object being used in later runs" to 3.3 LTS

Backport "Fix stale top level synthetic package object being used in later runs" to 3.3 LTS #1465