Merge "lshal: remove "// static" comments"