Merge \\\"Use correct switch/checkbox ID in accessibility code\\\" into nyc-dev am: ac2029950f am: a8e77aa2ee
am: ccead48cc6

Change-Id: Ifb974efc875acb59177a9ec755bf653228d1b918