Workaround for border-radius due to bug 49074

Change-Id: I411ea2cda0fcfc0c3182189ed6dc2f25851cd04c
Merge "Workaround for border-radius due to bug 49074"