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

Change-Id: I11a04fab8e1eca4fded7150bd9345f52553d8886