am 95f140a8: am 135e380f: am 57686525: Merge "Fix NPE in PhoneAccountSettingsFragment" into mnc-dev

* commit '95f140a881dad1130139cd98168ef54f73e608a5':
  Fix NPE in PhoneAccountSettingsFragment