Merge "Fix NPE when storing available softap freqs" into udc-dev