am a5f158bd: Merge change 2347 into donut

Merge commit 'a5f158bdde77f8d173d1f1c95d0f92405c519b0f'

* commit 'a5f158bdde77f8d173d1f1c95d0f92405c519b0f':
  Fix Disconnect path for CDMA.