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

Change-Id: I87fa85147dd03dd01a81b968a6f1f4aa9487b2f5