Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
am: 5c5f1f6419

Change-Id: Ib93c82921f7651db143355224231fe41db87137e