Merge "String and accessibility changes." into nyc-dev