LPS-47682 Fix compilation problem
LPS-47682 update import references
LPS-47682 SF