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

* commit '830561bb2b34ca8c09be4860380e9032202c3112':
  Fix null pointer dereference.

Change-Id: I82a4e97c61c1d3aaef1e4af1292cab06eb804ccc