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

Change-Id: Ia73eecbeef16c1572b0c357f2590c0897ce98412