v187 Remove empty array warning.
(cherry picked from commit 10762f628b0056c3ef52abb120583918522a2641)