Merge "Rename attribute dotRadius to avoid conflicts with wear" into nyc-mr1-dev am: 71b3721540
am: 19442f100f

Change-Id: Ifb992b70260f5f41fe71903d340f5109add9b50c