[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: b7568fd3 -s ours
am skip reason: Change-Id I8e4117cefc90ca71f67b68188d2eb3f528854957 with SHA-1 8f438bcb is in history
Change-Id: I9f6087c773119e5729292d4d0408a1e789c69ea2