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

Change-Id: I310ca32a0c418a7631eeb4303221613ce25c74ed