am 106a6927: Merge "Keep callback reference from being null." into jb-mr1-dev

* commit '106a69271dd303baae1c428e269e1ec62994ff57':
  Keep callback reference from being null.