Merge "Fix NPE in PhoneAccountSettingsFragment" into mnc-dev