Merge "BLASTBufferQueue: Fix two conditions leading to freeze." into rvc-dev am: 85c13cf111 am: 8fa7ea91ba am: 2e4b6107a0 am: 8b67d0546a

Change-Id: I7593cb1f04585d35a438680dac4aef0e0ddc170d