Merge "Generate lsdump without sdump" am: df6ed868b9 am: 277494d4aa
am: a2b16b2bff

Change-Id: Ib15d01c37ff9bd7a17feb0ec110a9f7158ac09c7