Merge "Make comment more inclusive to all a11yServices"