LPS-39035 Fix imports