Merge "Add data integrity checking for wifi passwords"