Merge "Strengthen language about use of a11y API." into nyc-mr1-dev