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: 00127b1e
Change-Id: I8fd4f642623dff122ef809d8bebe03abf655c21c