[automerger skipped] Adding support for storing keywords in iconCache
am: 934ebd087b -s ours
am skip reason: change_id I1183e63a6556ebfb3eee5df23d149e09728193a9 with SHA1 e529a86fbd is in history

Change-Id: Ib88dc17c83c95d0b2437f2d8e1c7b638cd863e5e