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

Change-Id: Iba451558e203cc2f4f4a8f820f8172c1937f39db