am 59867a8f: Merge "Cleanup StringAndJsonUtilsTests"

* commit '59867a8fdb5882e7cd00dd35a5a314559d4decf5':
  Cleanup StringAndJsonUtilsTests