Merge "Fix null pointer dereference." am: 830561bb2b
am: 05c5ef4757

* commit '05c5ef4757811a7231848799b616e71b6cb9a60d':
  Fix null pointer dereference.

Change-Id: If13e8462508ff9da69e3550dab0530f4e5b8daff