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

Change-Id: I5461cbaa37378dfa11043ed4b7fa33d72ce5955f