(Bug 64019): Return array of tokens where array was expected.

* This should fix the error/warnings logged in production.

Change-Id: I01434b07159ee98a1de23b40e470dd8de9a43b88
Merge "(Bug 64019): Return array of tokens where array was expected."