Merge "[CS] Unregister callback as part of onUnavailable dispatch"
am: e2ba92c411

Change-Id: I14d3c0f6c606020bd1d1e756174a66ee933cb15f
tree: 552758ed4501de8899a99ea0d0225684737adf02
  1. core/
  2. services/
  3. tests/