Merge "Merge "Switch from deprecated -stubpackages to --stub-packages" into main am: eaceceda38 am: 5e81a24e1e" into main