Merge "Adjust icon width to match the width with framework" into oc-dev
am: 7acd87d8d0

Change-Id: I17195379a917347d10a2aa11e1788ea920cde61d