Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073

Change-Id: I0b0ad731d0c5f0cfc496846a3622b42bc0a11e4e