Merge changes from topic "presubmit-am-9b5e750ffe3a4cb798418c89d9e7f523"

* changes:
  [automerge] Re-land "Move rounded corner to provider" 2p: 4301034952 2p: 88e14532f8
  [automerge] Re-land "Move rounded corner to provider" 2p: 4301034952
  Re-land "Move rounded corner to provider"