Merge "Update colorPrimary in watch" into cw-f-dev
am: 447fff8589

Change-Id: I0e021db6fe386b0ca7a05db97add2e7f36e85b05