Merge commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678' into eclair-plus-aosp * commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678': Fix async calls with Connect And Disconnect Sink.
Merge commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678' into eclair-plus-aosp * commit 'cfc7f1aaefa60f43e27969690a939f664ff1c678': Fix async calls with Connect And Disconnect Sink.