Merge \"Make watch Switch thumb color consistent\" into nyc-mr1-dev
am: 1d2cd33cfe

Change-Id: Ifebdbaf7370f41333914289919aed16f40ae9598