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

Change-Id: Id8eb2f0fd16cf075669307a27d34fef92fd33279