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

Change-Id: I48baac1a71424cdf156c125d03c6571f34fa1f49