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

Change-Id: Ic0ee4d27690ba0f0ebdc50b1913c7c6c91e4b30b