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

Change-Id: I8d7b0cefb1793d8287528004421b171b9748ec28