Feed only array type to array_merge()

storage->find() returns null for empty result

Bug: 65963
Change-Id: I81b4e796c16bbce79cc325a7c56c540336e5ab66
(cherry picked from commit 884dfa2ff779235e609e73380c37d06937d8dec7)