Merge "Fix JSONArrayTest."