am 9d9251c8: am 847d677f: am 3c40675f: Merge "Fix potential NPE when saving fragment state."

* commit '9d9251c8caee4a847b630653204bb205a1fbed09':
  Fix potential NPE when saving fragment state.