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

Change-Id: I2e1bb01d2830d90ba10ed1e997ea2d0b2cfea371