Merge "Add lshal --neat option" am: 3a6828d50b
am: 702ca32b5a

Change-Id: Ide589b0a4487a0a50e43fcda179bba7ad5600fc4