LPS-38527 Global scope import changes

cc: @mhan810

Ran on jenkins, no related failed tests found.