LPS-52132 Add missing imports
LPS-46804 Fix regression caused by 66dc1d9fd33f342b02ebef1bd8b392ad84581018