am a100087c: am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev
am a100087c: am 2afe0611: am e6e81004: Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev

* commit 'a100087c5b803c2dd261598b4fdb9219f49798a2':
  Cleanup on async disconnect and finalize

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base