Merge "CDD: Relax the radius requirement for rounded corners" am: 3f59c47dd5
am: be2362691e

Change-Id: I418c1811473af2451d17d7687986314168505ec3