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

Change-Id: Iae4386977c2efd4772b455aff295842f2cd39bec