Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am: e5c09e42eb

Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5