Merge \\"Update theme colours for watch type devices.\\" into nyc-mr1-dev am: 36bc5d5862
am: 4a5e1bd972

Change-Id: I2885555a62d5f3726dc6944ce9830e1ee68f0839