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

Change-Id: Ia607037c2fb4b653138f4e80d1f2ea23865c4671