fix bugs left over from *[] to [] conversion. TBR=r OCL=21576 CL=21581
Attach a file by drag & drop or click to upload
