Merge "lshal: update descriptions in output." am: 074c1cd157 am: 105e9391ac
am: 76ccc8cbd1

Change-Id: Iadb1ea22c087d643d0664919411a3e2408d12fd1