am 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev

* commit '5b8b0df7bfcbeb8a6ac165fcbcad57aa2b597004':
  Add handler parameter for callbacks.