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

Change-Id: I4fbb0de503aeaa8c43d55f0be9a782e495f17364