Merge "Cleanup StringAndJsonUtilsTests"