LPS-44864 add MapUtil to compat
LPS-44864 Use compat MapUtil