Merge "Test case coverage for MapperUtil.java"