Merge "Fix the issues highlighted by ArrayToString"