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

Change-Id: If89739d3318c70d907070da796f8874b21e30bda