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

* commit '5116b9f15f49e232dd4f647de094e51b6148ed5d':
  Fix null pointer dereference.

Change-Id: I0de2b71b0480a023e5dd69610a14bcc66a4d534e