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

Change-Id: Ibd3e2e1e5f0917c2c36befba105d5b4029934e58