Merge \"Updated colour theme for watch devices.\" into nyc-mr1-dev
am: a7d4adaac7

Change-Id: I684caf5e6e007582b2b0e73e246d582399417042