Merge "Decouple DatabaseBlock::newFromTarget from DatabaseBlock::newLoad"