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

Change-Id: Iec16a5ce69754ac59b9c0e3acea5f7e58ee400d3