Merge "Lshal: note debug in help" am: 1a1d34791e
am: 8ddafb99ba

Change-Id: I5c5ea05746b910c0078cd5b15462a8aba88d731e