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

Change-Id: I51819a42a0a28dd49dbc176fc4fb2fd767323c41