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

Change-Id: Idc20030dba8acb3869bff8dac63622327d889be8