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

Change-Id: I6704ba59c70699b2d8f88fdc105168973cf2710c