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

Change-Id: I14d3c0f6c606020bd1d1e756174a66ee933cb15f