Merge "Update TreeMapTest golden value"