LPS-43332 Add imports

Pushed to upstream cc/ @robertodiaz