am 7d329785: am d1559d6b: Merge "Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call." into gingerbread

Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'

* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.