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

* commit 'b2dd62f3fda38bc2bf8110b758eca162b6de8bb8':
  Fix null pointer dereference.

Change-Id: I0f8fcb8f14d5cecfcfb4a9214d9340f8529b509d