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

Change-Id: I76510fd3cbf525bea046e84f163d7f1e0a22fecb