Merge "Update icons to have rounded corner" into oc-mr1-dev am: e61844e265
am: 66c57262fa

Change-Id: I6d8dee27c316ecfc7c41ddb9e8a93e9b6a6e4dad