Merge "Add strings for improving Wifi wrong password UX"