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

* commit 'c493f43fe1f0b7b1ed62ae85065d7c8f66803273':
  Add handler parameter for callbacks.