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

Change-Id: Id5e265bb237d5cf55fbc3d62736a8de4be0f2100