Merge "Add vdc checkpoint supportsBlockCheckpoint"