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

Change-Id: Iaa60e243566133d1674b2591becdbc9ead403754