am 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

* commit '9545b6707e8c2213806c71fa9b0cae608b8bc032':
  Avoid a deadlock during EmptyBufferDone