Merge "Null check listener before dereferencing for callback." am: 27b9913521 am: 4747e2b9cc am: 9a6ea44991
am: ecb0a781ea

* commit 'ecb0a781ea445cb9466486b6f9b0c4a1fafee264':
  Null check listener before dereferencing for callback.

Change-Id: I458979adfa085b763934ef4017205353267bd91c