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

Change-Id: I35e1e68fe5adadde63cd98215918493feccad9c6