Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev