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

Change-Id: I4320b6719fc12cd650e44f033598f7245c49c7bb