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

Change-Id: I3ffdc4f02df869c3f4e5028547bfb9bec308f7ee