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

Change-Id: I885db69dcb088dd9df2418cae7b575ac00e90b3b