Merge "Generate lsdump without sdump"
am: df6ed868b9

Change-Id: Ibc01fce4dc91a3371ed5f7502401669ae4fc890b