Merge "Add Hexagon (Victor) shape to icon shape overlay (will show up in...
Merge "Add Hexagon (Victor) shape to icon shape overlay (will show up in custom options)" into rvc-dev am: ab2c1bb0 am: a36c187b
Change-Id: I0e386463068c151566e8648b53293b2df26634e5