Merge "Fix array-related errorprone warnings"