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

Change-Id: I9dfa8644300c91bc2149e9f7f4ba5c978b85ecf5