Merge "Use toArray(T[]) instead of toArray()."
am: bede9f869b

Change-Id: I8099a859b053234a66f2435f14f622847e5ad511