Merge \\\"Use correct switch/checkbox ID in accessibility code\\\" into nyc-dev am: ac2029950f am: 6f918d0e73
am: daa854dd0d

Change-Id: Ic7cfa853a7ce1d96e0d274f056ab6a06a805c64b