Merge "fix NPE when sim is absent"