Merge "Generate lsdump without sdump"