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

Change-Id: I1e6bae29597218ec1165e95cac8ff3aaa3ce4fc6