Merge "Update icon shape for Sam" into rvc-dev am: 1bad463073 am: 91cc44c324 am: 55181e8006

Change-Id: I12b3e01966e84dd01b99f6939d87b1744fc7aaf9