LPS-44647 Add imports

Pushed to upstream