am 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit '2d314d1282067518bcd34015f629c5d3e6ff15a1':
  DO NOT MERGE - Clear backoffs on reconnect