Merge "Remove verity blocks from care map"