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

* commit '972e0c7b3e5ba30c844e388eb6736fb745b0e3f9':
  Add handler parameter for callbacks.