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

Change-Id: I7f0c45298f61b6f54fea3a5705d2ded08e106787