Merge \\"Make watch Switch thumb color consistent\\" into nyc-mr1-dev am: 1d2cd33cfe am: 2d1c1f40a3
am: 7657af8d2c
Change-Id: I443b1c5651fdc93629439885d944dc5c868631b4
This commit is contained in: