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

Change-Id: Ie4942dc442b6542ec78d1b9a23ad6a78c4657f0d