Merge "Unit test for JsonUtil"