Merge "Round mobile icon slash and fix color" into oc-dr1-dev am: 2809c2fb0b
am: 14c291e322

Change-Id: I02535631dad6d114987f23e5c8eb51cf211682d6