Merge "Fix wifi connectivity issues." into lmp-preview-dev