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 am: 44e93a0b
Change-Id: I8b8937373921abc479c109bbebeb16a518874234