Merge "Null check listener before dereferencing for callback."
am: 27b9913521

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

Change-Id: Ic9c5735127c1836b82f351f947c206318fa97057