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

Change-Id: I370d3e284c74e4763e5fd148d946659d9cb9d2f7