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

Change-Id: I236e63e28858474bb0553941d0932421bc6d0cf3