Merge "Add test for lsdump in JSON format"
am: a441e936f1

Change-Id: I8b83deec31ca2434babae0b66ccf50d03b948e7c