Merge "BufferPool: Avoid implementation-defined behavior" into rvc-dev am: a41b0d0145

Change-Id: Ieb1b2bf09fca6dde798f3b54fe4363a261c7dd6d