- support shadowing module imports by package-on-demand (cherry picked from commit 643fc10bcbfee2f1d41ec02e624b30bc3a48e4bb) GitOrigin-RevId: d1e49b2d48f0b69f8e15393cb823e5529f9b4452