am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0

* commit '2159927f366fd8a617128df60865923e131cad7b':
  Fix handling in DisconnectingState