[automerger skipped] Update icon shape for Victor am: 5194889f -s ours am:...
[automerger skipped] Update icon shape for Victor am: 5194889f -s ours am: 5d2a2756 -s ours am: 66c829a1 -s ours
am skip reason: Change-Id I8e4117cefc90ca71f67b68188d2eb3f528854957 with SHA-1 2eb4d4db is in history
Change-Id: I6225f39a0493220d298dfd40af517ef3925bfac6