[automerger skipped] DO NOT MERGE: Allow corner UI to decouple from rounded_corner_radius am: 93158329 -s ours am: dd2bd910 Change-Id: I55e687b85fb61707bf4e21ff9e223a5ffb2578f9