Merge "Fix CTS failure with rounded corners" into oc-dr1-dev
am: 700d0625a4

Change-Id: I62a21f3538a798b5037700f6cd245450d7fda233