Merge "BufferPool: Guarantee double-loadability" into rvc-dev am: 241746e794 am: b54e5739b3

Change-Id: Iad1eb71f2b6058e0583b94824ac696201d2cd3f4