Merge "Fix issue with wifi passwords >16 chars" into lmp-dev