Merge "Add Flower (Sam) shape to icon shape overlay (will show up in custom...
Merge "Add Flower (Sam) shape to icon shape overlay (will show up in custom options)" into rvc-dev am: d60abb52 am: bcdb4e15
Change-Id: Icfb1166389a9e5d03a2b2e1ac9e303b1cf28ad24