Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev