Merge \"Fix Switch in SwitchPreference on watch\" into nyc-mr1-dev
am: 90cd4449bb

Change-Id: I8a36f3177a90c4ca2722da3ac4fa627561482567