Merge "BLASTBufferQueue: Fix two conditions leading to freeze." into rvc-dev am: 85c13cf111

Change-Id: Ice58ac34bc521ebed05ba23bc4ab7ae7bf8370da