Merge "Use correct conversion for ArrayList to array." into nyc-mr1-dev