ec22b4c468
Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d' * commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d': Fix NPE when importing from USIM.