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

Change-Id: I1d886e149494d9e479673bcd606d06c6e4572f27